Merge branch 'master' into develop
authorjustbur <justin@burkett.cc>
Mon, 20 Jul 2015 03:20:30 +0000 (23:20 -0400)
committerjustbur <justin@burkett.cc>
Mon, 20 Jul 2015 03:20:30 +0000 (23:20 -0400)
commit8bfe9cb732750293b8c01a383b320c783fb07d34
tree46850a00c5e87e65d72481728ecc2820ad9f78a9
parent1bac4b029c07a5f0067a4768a8b4319cc99e9e74
parent5ce4a5cb24f4a83e2259751f6ffebbdf44acc14d
Merge branch 'master' into develop

Conflicts:
README.org
which-key.el
README.org
which-key.el